Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 10 Sep 2011 19:27:43 +0000 (12:27 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 10 Sep 2011 19:27:43 +0000 (12:27 -0700)

Trivial merge